Auto merge of #3031 - matklad:lockfile-test, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 23 Aug 2016 20:57:48 +0000 (13:57 -0700)
committerGitHub <noreply@github.com>
Tue, 23 Aug 2016 20:57:48 +0000 (13:57 -0700)
Lockfile test


Trivial merge